All Questions
Tagged with version-control merge
909
questions
0
votes
0
answers
29
views
Is there any reason why some would want to rebase a branch and then merge --no-ff to force a merge commit?
From what I understand, rebasing essentially moves the base of your branch to a more recent (the most recent?) commit to make it seem like you branched off later than you actually did.
This makes it ...
- 1,100
0
votes
0
answers
31
views
How to resolve a merge conflict in Git? [duplicate]
I am working on a project with a team and we are using Git for version control. I recently pulled the latest changes from the remote repository and tried to merge them with my local branch. However, I ...
0
votes
1
answer
170
views
How to maintain a release branch in git?
we have master branch and a release branch. We cant push directly to any of these two branches. We only merge into them from feature branches.
The idea is that master branch is the development branch ...
- 3,116
0
votes
1
answer
1k
views
Undo already merged merge request to main in gitlab
Please help.
How do I undo a merged merge request i made from a feature branch to main in gitlab?
I am doing this from Pycharm git and tried hard reseting to before merge, but it doesnt let me force ...
- 29
1
vote
2
answers
448
views
Cherry pick all changes from a feature branch to a hotfix branch
I've gotten myself into a predicament with git.
The setup is as follows:
We have master, stage and feature branches. We are using merge strategy, without squash.
We were implementing multiple ...
- 613
0
votes
0
answers
48
views
How git detect conflicts when merging
I don't understand in what condition do git consider there are conflicts when merging two local branches.
When I create a file a.py in branch test1, then merge it to another branch test2, and then ...
- 11
0
votes
0
answers
54
views
Git rebase from from one particular commit
Assume my git branches looks like this
A -- B -- C -- D -- F -- * -- G -- H -- * -- K ( Main branch )
\
G -- H -- I -- J ( Feature branch )
one guy created a new Feature branch and coded ...
0
votes
2
answers
59
views
Return back to existing files in a git repository after merge
One of my client have a local folder, previously connected with an on-line repository, where inside I did many modifications to files and folders. Later they said that these were not important anymore ...
- 475
0
votes
0
answers
27
views
How to solve "branch ahead of origin/<branch_name> by X commits" and discard those X local commits? [duplicate]
I am new with Git, but I would need some help. How to get rid of those X commits? I don't want to push those local commits, since I don't have the rights to push into that specific branch (it's ...
- 181
0
votes
1
answer
56
views
How to handle Git merge conflicts in Git Pull
After the project branch from master, my team and I works on the dev branch to add new features. As multiple people are committing changes on same files, merge conflicts constantly appears.
Is there a ...
- 7
1
vote
0
answers
49
views
Resolve merge conflicts between divergent commits with merge driver using subtree
I use a git repo to store my vimwiki, a personal wikipedia which houses diaries, some latex, but mostly markdown wiki files. I then have this repo locally stored on two machines, one at work, and
one ...
1
vote
0
answers
314
views
Merging git submodule inside main repository with LFS objects
I am looking in how can I merge existing submodule to my main repository. Basically currently my repository looks somehing like this
├── example1.java
├── example2.java
├── img
| └── image.jpg
└── ...
1
vote
0
answers
228
views
Gitflow merge strategy, merge commit, squash or rebase?
We use the gitflow branching strategy at work and I'm curious as to what would be the best merge strategy when merging pull requests?
Up until now we have exclusively used the typical merge commit but ...
- 4,184
1
vote
1
answer
23
views
Is it safe to merge a branch created from an old commit in two, separate branches that are a lot more recent?
I have the following Git situation:
where:
I was in commit A and, from there, I continued developing towards commit B.
Arrived in commit B, I decided to create a new branch from the old commit A, ...
- 2,687
0
votes
1
answer
428
views
Downsides of merging feature branches based on master to another collaboration branch AND to master?
Today I'm working with a trunk-based development styled branching strategy, which is not optimal from a deployment and collaboration perspective for different reasons. I have an idea to replace this ...
- 1,035