git-merge Questions
2
Solved
I performed multiple merge commits but they should have been merge --squash instead. The conflict resolution took more than a day so I can't afford to redo the merging by hand.
Is there a way to c...
Stillage asked 14/11, 2016 at 11:25
3
Solved
I have a question with regards to a flag which can be used with the merge command in Git. Apparently, if you use --no-ff with merge (no fast-forward flag), it will create a new commit object at the...
7
Solved
How could I force the mergetool GUI to be always shown and disable any automatic resolving?
Sometimes when there is a conflict during a merge and I use the mergetool, it simply immediately returns...
7
Solved
I have created a new remote repo "infrastructure" on GitHub.
I have then created a local repo on my computer in the folder "infr" with git init
When I pushed my local repo with ...
5
I begun a workflow where I aim to do all new features in a development branch and the master branch will only be for production ready code.
After doing the following:
git checkout master
git merg...
Crichton asked 22/10, 2013 at 11:3
3
Solved
Merging in a xcode storyboard with many team members can produce many conflicts etc. I need a strategy to share a storyboard with 20 team members but to avoid the nightmares associated with merging...
Tenpins asked 25/3, 2015 at 18:32
4
I have a feature-branch which is from master some time back. Now, master branch has advanced and feature-branch has many sub-branches on top of it.
I want to have all the new changes from master br...
Karimakarin asked 23/9, 2021 at 7:16
8
Solved
3
Solved
git-rerere is the exact solution to a problem I have ... except that the merges that need to be "learnt" have already been performed and are non-trivial to repeat.
How can I "teach&q...
Burdine asked 8/7, 2022 at 12:54
21
Solved
On my branch I had some files in .gitignore
On a different branch those files are not.
I want to merge the different branch into mine, and I don't care if those files are no longer ignored or not...
15
Solved
In my repository I have a branch called aq which I'm working on.
I then committed new work and bugs in master.
What is the best way to get those commits into the aq branch? Create another new br...
Gora asked 17/3, 2011 at 14:51
4
Solved
I'm working with a repository where a merge was performed weeks ago which we just discovered used the --strategy=ours flag (it was supposed to use the --strategy-option=ours flag), thus not applyin...
Fattish asked 8/1, 2013 at 23:26
5
Solved
I have two git branches, develop and redesign that I need to merge. I have a submodule called library where its updates are being tracked by develop. When I run 'git merge' it says library has been...
Leath asked 23/8, 2019 at 20:23
24
Solved
I just need a plain list of conflicted files.
Is there anything simpler than:
git ls-files -u | cut -f 2 | sort -u
or:
git ls-files -u | awk '{print $4}' | sort | uniq
I guess I could set up...
Landslide asked 17/6, 2010 at 21:8
3
I am having problem with Git rebase that I have to merge the code again and again but still unsuccessful.
I had cut of my branch (A) from master. I started working on my branch and made more commi...
Forbearance asked 3/4, 2015 at 2:35
5
Solved
I sometimes need to make a snapshot of the current (possibly dirty) working directory. git stash save -u is very similar to what I need but there are two problems:
I want my working directory to ...
Torp asked 18/2, 2018 at 21:14
2
Solved
I was wondering whether it's possible to automate merging of branches after tests pass using GitHub Actions.
We have two branches, 'test' and 'main'. After every merge or push to 'test', we have a ...
Jaddo asked 25/3, 2022 at 21:0
11
Solved
This question is similar to this one, but more specific.
I have a project with two branches: staging and beta.
I develop on staging, and use the master branch to fix bugs. So if I'm working on stag...
Doublure asked 15/3, 2014 at 13:1
5
Solved
I've lost files added to git during "merge conflict" phase.
Step by step:
git pull
git status
Git informs me about "merge conflict", that's okay. Then I create a new file and add it to git.
vi...
8
Solved
I forgot to git pull my code before editing it; when I committed the new code and tried to push, I got the error "push is not possible".
At that point I did a git pull which made some fil...
10
Solved
I made some changes to my branch and realized I forgot I had stashed some other necessary changes to the said branch. What I want is a way to merge my stashed changes with the current changes.
Is t...
4
Solved
I am working on a project using Git as the VCS. I got a branch xyz cut from the mainline branch of master. After working for a while, I committed my code and took a pull of the branch mainline.
Th...
22
Solved
I ran a git pull that ended in a conflict. I resolved the conflict and everything is fine now (I used mergetool also).
When I commit the resolved file with git commit file.php -m "message" I get t...
Oversubtle asked 29/4, 2011 at 4:36
5
Solved
Is it possible to merge pull request automaticaly to master branch on github after success of travis test webhook?
Coveney asked 12/3, 2015 at 16:40
4
Solved
I have 2 branches in my Java project: master and refactor. I've finished working on refactor so now would like to checkout master and merge refactor into master. While working on the refactor, I al...
Rhizocarpous asked 21/1, 2017 at 21:56
1 Next >
© 2022 - 2025 — McMap. All rights reserved.