Questions
Linux
Laravel
Mysql
Ubuntu
Git
Menu
HTML
CSS
JAVASCRIPT
SQL
PYTHON
PHP
BOOTSTRAP
JAVA
JQUERY
R
React
Kotlin
×
Linux
Laravel
Mysql
Ubuntu
Git
New posts in merge
git get conflicts from past merge without running merge once again
Nov 08, 2012
git
merge
How to deal with tree conflict while merging using TortoiseSVN, in case of a deleted folder?
Aug 20, 2018
svn
version-control
merge
tortoisesvn
tree-conflict
Git: Merging and Submodules
Mar 28, 2022
git
merge
git-submodules
How could I merge an XSD schema with imports and includes into a single file? [closed]
Sep 21, 2022
merge
xsd
Operating a GitHub pull request on Android Studio
Aug 23, 2022
github
android-studio
merge
pull-request
What is the purpose of a separate merge commit in git?
Apr 06, 2018
git
merge
git: how do I merge between branches while keeping some changesets exclusive to one branch?
Sep 12, 2022
git
version-control
branch
dvcs
merge
Can I git stash a merge in progress?
Feb 10, 2019
git
merge
git-stash
Check if a pull request is up to date with the target branch
Sep 12, 2022
git
github
jenkins
merge
github-api
Git - Bare repo cannot have a worktree for master branch - WHY?
Sep 11, 2022
git
version-control
merge
git-bare
git-worktree
Gerrit always rebase before submit patchset to avoid a merge commit
Sep 21, 2022
merge
submit
gerrit
rebase
Combine two lists of dataframes, dataframe by dataframe
Oct 24, 2019
r
list
merge
dataframe
How to restrict merging specific branch into other branches in Gitlab?
Aug 21, 2022
python
git
merge
gitlab
GIT: how to force a merge commit to an ancestor
Sep 21, 2022
git
merge
commit
Identify records in data frame A not contained in data frame B [closed]
Oct 19, 2022
r
join
merge
match
dataframe
Postgres UPSERT (INSERT or UPDATE) only if value is different
Oct 31, 2022
sql
postgresql
merge
upsert
git: can I subtree merge just a subpath of a repository?
Sep 21, 2022
git
merge
version-control
subtree
Is there any way to svn diff or svn merge across multiple non-sequential revisions at once?
Mar 06, 2018
svn
merge
diff
revisions
R: Efficient Way to Merge+Update Table With Second Table Where Values from Same Column Names Fill NAs
Oct 27, 2022
r
join
merge
data.table
With Git, is it possible to re-apply an ancestor revision?
Nov 10, 2022
git
version-control
merge
« Newer Entries
Older Entries »