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 branching-and-merging
TFS How does merging work?
Oct 29, 2022
tfs
merge
branching-and-merging
How to choose the right branch/fork to use by looking on the github's network graph?
Aug 30, 2022
github
branch
branching-and-merging
fork
Git merge: take everything from "theirs" branch
Jan 13, 2020
git
merge
branching-and-merging
git-merge
mercurial - see changes on the branch ignoring all the merge commits
Jul 20, 2022
mercurial
branch
diff
branching-and-merging
Remove a Branching Relationship in TFS 2010
Mar 16, 2022
tfs
branching-and-merging
How should I handle a pull request in BitBucket which requires some tweaks?
Jan 14, 2020
version-control
mercurial
open-source
branching-and-merging
SVN - automate merge of trunk into branch
Mar 29, 2022
svn
version-control
tortoisesvn
branching-and-merging
Merge conflicts updating from upstream
Nov 02, 2022
git
github
branching-and-merging
git pushing to a branch post merge
Oct 01, 2022
git
git-merge
git-branch
branching-and-merging
Stuck with two default branches in Mercurial after broken branch commits
May 17, 2022
mercurial
branching-and-merging
Bug fixes in a feature branch
Sep 23, 2022
git
git-branch
branching-and-merging
feature-branch
Git update branch to master
Sep 23, 2022
git
version-control
branch
branching-and-merging
Can you remove Git commits from a branch that exist in another branch like an "intersection" of commits?
Nov 08, 2022
git
branching-and-merging
Git shows no merge conflicts when it should
Nov 18, 2022
git
github
merge
branching-and-merging
git-pull
Good strategy to handle dependencies between sequential pull requests
Feb 09, 2020
git
github
version-control
branching-and-merging
pull-request
How can I know in git if a branch has been already rebased onto master?
Apr 02, 2022
git
branching-and-merging
git-rebase
GitLab CI: Get source branch after merge-request has been accepted
Dec 25, 2020
git
merge
gitlab
gitlab-ci
branching-and-merging
Merging Git Flow Feature Branch after Hotfixes?
Feb 21, 2022
git
branching-and-merging
git-flow
hotfix
feature-branch
git tells me that I Merge conflict, but also tells me that no files need merging
Nov 19, 2022
git
branching-and-merging
git-merge
kdiff3
mergetool
git: merging a subtree from one branch to another
Jul 17, 2018
git
branching-and-merging
« Newer Entries
Older Entries »