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 git-merge
How to retrieve branch names in a custom Git merge driver?
Apr 01, 2019
git
git-merge
Git refusing to merge because of changes to an unchanged file
May 23, 2022
git
merge
git-merge
How do I accept Git branch merge changes in multiple files in one go in Visual Studio Team Explorer?
Mar 29, 2022
git
visual-studio
git-merge
branching-and-merging
team-explorer
Equivalent of git checkout ours/theirs for submodules
Dec 19, 2019
git
git-merge
git-submodules
Determining why github says "Closed with unmerged commits"
Nov 08, 2022
git
github
branch
git-merge
pull-request
My dev branch is 1 commit behind master after pull request
Sep 24, 2022
git
github
git-merge
pull-request
Use Github API to disable the merge button on a pull request and reenable it using REST
Dec 03, 2018
rest
curl
git-merge
github-api
pull-request
Do the commit ids remain same after a merge?
Oct 25, 2022
git
bitbucket
git-merge
How to merge files from one branch's directory into another branch?
Nov 04, 2022
git
git-merge
branching-and-merging
git-checkout
Tell git not to merge binary files but to choose
Oct 16, 2022
git
merge
binaryfiles
git-merge
use git cherry-pick now but merge changes later
Oct 16, 2022
git
git-merge
Which commit hash to undo a pushed merge using git-revert?
Sep 07, 2022
git
undo
git-merge
git-log
git-revert
Undo a Git merge, but keep later changes, and rewrite history
Dec 03, 2017
git
undo
git-merge
Viewing changes to deleted files in git
Nov 05, 2022
git
git-merge
merge-conflict-resolution
Git pull overwrites and does not merge or acknowledge conflict on same branch (master)
Feb 19, 2022
git
merge
version-control
git-merge
git-merge-conflict
Git rebase after merge confused about deleted file
Dec 22, 2018
git
git-merge
git-rebase
Git: switch branches mid-merge
Nov 08, 2022
git
git-merge
Forcing 'git merge' to declare all differences as a merge conflict
Jan 22, 2020
git
git-merge
Bitbucket: Conflict in remote repo, can't figure out how to resolve
Mar 07, 2019
git
bitbucket
git-merge
merge-conflict-resolution
Git: pre-receive hook to allow only merges and not direct commits into master
Nov 17, 2022
git
git-merge
githooks
git-commit
« Newer Entries
Older Entries »