fast-forward Questions
34
Solved
After a git pull origin master, I get the following message:
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of t...
Martens asked 30/6, 2020 at 8:18
7
Solved
So one of my colleagues attempted to merge a branch using GitHub's "merge via fast-forward" option in the web-interface, to keep the history clean from bogus merge commits (the master bra...
Crellen asked 9/3, 2020 at 9:6
5
Solved
I can't really ever think of a time when I would use git merge rather than git rebase and not want to have a commit show up. Is there any way to configure Git to have fast forwarding off by default...
Chronometry asked 23/3, 2010 at 13:38
2
Solved
What is the difference between a fast-forwarded git merge and a git rebase? Don't both accomplish keeping history linear and no merge commits? If so, why would one use one over the other? If not, w...
Yep asked 7/1, 2022 at 22:16
2
I'm trying to setup a gitlab worflow for my team with gitlab-ci. We have a Gitlab CE version 10.2.4 with gitlab CI configured to run a build on every push. Now we would like to use the merge reques...
Emilioemily asked 26/1, 2018 at 13:57
7
Solved
Using gitk log, I could not spot a difference between the effect of git merge and git merge --no-ff. How can I observe the difference (with a git command or some tool)?
Skullcap asked 30/1, 2012 at 18:45
3
Solved
(For simplicity) I have a master branch and a dev in my Git repository. I want to ensure the master branch is always working, so all work I do should be in the dev branch.
However, when I merge my ...
Fettle asked 7/11, 2016 at 9:47
7
Solved
I would like to protect my git repository so only non master branches can be overwritten. Is there a way to protect only selected branches?
Breathed asked 16/7, 2012 at 7:26
2
Solved
* 9dbd857 (hotfix-correct-java-jdk-path, feature/add-ansible-galaxy-requirements-file) requirements.yml: adds maven and nodejs requirements
* 1643619 (QOL-1640-enable-vpc-peering) roles/ansible-lin...
Tynishatynwald asked 18/7, 2017 at 0:14
1
Suppose there is a feature branch 'my-feature'. While I was developing the feature, somebody merged it from 'my-feature' into 'master'. Because it was a fast-forward merge, no commit was made. Some...
Clisthenes asked 30/8, 2016 at 14:10
4
Solved
I want to know if a particular merge will resolve via "fast-forward" or not before running the merge command.
I know I can specifically request for the merge to not be resolved via "fast-forward"...
Matrimonial asked 6/6, 2016 at 2:47
2
Solved
I have this situation :
Working on some testBranch for some time and I wanted to sync with master so I did
git checkout testBranch and
git merge master/testBranch
So now my branch is synced with ...
Keslie asked 11/6, 2013 at 9:54
2
I'm using git for a long time now. But I've never used it in a collaborative way. I'm currently setting up a new project and planning a lot of things, among others: how to git?
Okay so I've starte...
Partible asked 9/6, 2015 at 18:23
2
Solved
I want git to always make merge commits (--no-ff) when I use git merge, but keep the default behavior (--ff) for git pull. Is this possible (with configs)?
Pukka asked 20/2, 2015 at 8:48
4
Solved
I am creating a SQL 2008 R2 stored procedure to duplicate a row and all it's children.
It's a 3-tiered setup with a Parent, Child and Sub-Child
Given the ID of the parent I need to create a duplic...
Halftimbered asked 31/8, 2010 at 21:59
2
Solved
I run git pull twice and get the following out:
$ git pull
remote: Counting objects: 1, done.
remote: Total 1 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (1/1), done.
From git.assembla.c...
Squamous asked 17/4, 2014 at 17:17
3
Solved
A Successful Git Branching Model recommends to use --no-ff when merging branches:
The --no-ff flag causes the merge to always create a new commit
object, even if the merge could be performed wi...
Abreu asked 8/8, 2013 at 12:41
3
I like to keep my feature branches up to date with develop. Is there anything wrong with frequently doing "git merge --no-ff develop". And then at the end, running "git flow feature finish feature1...
Afroasiatic asked 7/12, 2011 at 16:38
2
Solved
Coming from mercurial, I use branches to organize features.
Naturally, I want to see this work-flow in my history as well.
I started my new project using git and finished my first feature. When me...
Booher asked 17/5, 2010 at 15:26
1
I am using the Git Flow way of managing branches in my repository.
Thus the sequence of commands I should use would be as follows:
git checkout mybranch
git pull --rebase origin develop
git checkou...
Shelah asked 30/5, 2013 at 2:15
1
Solved
I installed and configured my own Gerrit server. I created a repository using the web gui for Gerrit. I am able to clone this empty repository succesfully using the "git" command, so the configurat...
Ferromanganese asked 18/8, 2012 at 17:23
1
Solved
Which one should one use to hide microcommits?
Is the only difference between git merge --squash and git merge --no-ff --no-commit the denial of the other parents?
Rhine asked 16/8, 2012 at 8:57
2
Solved
Can someone please provide a simple example of what would cause a Git push to a central repo to fail because a fast forward could not occur? What would the local repo vs the central repo's state ne...
Kings asked 6/8, 2012 at 19:6
2
Solved
I am trying on working on my featureA branch while keeping it up-to-date with the master branch.
Here is the scenario
git clone ssh://xxx/repo
git checkout -b featureA
$ git add file.txt
$ git...
Lubricator asked 20/1, 2012 at 23:3
1
Solved
Since some people recommend no fast-fordward (--no-ff) on merges in Git, I wanted to do that. But I can't see where to check to enable that in the TortoiseGit GUI.
Yes, I could do this from the co...
Chaisson asked 1/8, 2011 at 0:41
1 Next >
© 2022 - 2024 — McMap. All rights reserved.