8:54 a.m.
How you guys do this? I did a rebase -i and squashed everything but the
PR contained diffs of merged files and not just my changes.
--
Bill Burke
JBoss, a division of Red Hat
http://bill.burkecentral.com
8:59 a.m.
git rebase -i is helpful for merging together local commits.
Say you did 5 commits and they’re really a single feature. I usually, do:
git rebase -i HEAD~5 and use “fixup” to make them one commit.
Lastly, before pushing to create a PR, I rebase on master. This shouldn’t be interactive
unless there are conflicts. That’s just a:
git checkout master
git pull -r
git checkout feature-branch
git rebase master
Scott Rossillo
Smartling | Senior Software Engineer
srossillo(a)smartling.com
On Feb 29, 2016, at 9:54 AM, Bill Burke <bburke(a)redhat.com>
wrote:
How you guys do this? I did a rebase -i and squashed everything but the
PR contained diffs of merged files and not just my changes.
--
Bill Burke
JBoss, a division of Red Hat
http://bill.burkecentral.com
_______________________________________________
keycloak-dev mailing list
keycloak-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/keycloak-dev
9:23 a.m.
I just do:
git fetch upstream
git rebase upstream/master
And that's it
On 29 February 2016 at 15:54, Bill Burke <bburke(a)redhat.com> wrote:
How you guys do this? I did a rebase -i and squashed everything but
the
PR contained diffs of merged files and not just my changes.
--
Bill Burke
JBoss, a division of Red Hat
http://bill.burkecentral.com
_______________________________________________
keycloak-dev mailing list
keycloak-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/keycloak-dev
10:22 a.m.
can you do that after you've committed your local repo without screwing
anything?
On 2/29/2016 10:23 AM, Stian Thorgersen wrote:
I just do:
git fetch upstream
git rebase upstream/master
And that's it
On 29 February 2016 at 15:54, Bill Burke <bburke(a)redhat.com
<mailto:bburke@redhat.com>> wrote:
How you guys do this? I did a rebase -i and squashed everything
but the
PR contained diffs of merged files and not just my changes.
--
Bill Burke
JBoss, a division of Red Hat
http://bill.burkecentral.com
_______________________________________________
keycloak-dev mailing list
keycloak-dev(a)lists.jboss.org <mailto:keycloak-dev@lists.jboss.org>
https://lists.jboss.org/mailman/listinfo/keycloak-dev
--
Bill Burke
JBoss, a division of Red Hat
http://bill.burkecentral.com
10:39 a.m.
Yes, you can. In this case your commit will be put as last commit after
existing commits and your commit will receive new commit ID.
Few other points:
- If there is some conflict during rebase, the command "git rebase
upstream/master" will fail and it will show you which files are
conflicting. So in this case you need to manually resolve conflicts like:
git add some/path/ConflictingFile.java
git rebase --continue
- For the case you already pushed to github and then you rebased, the
commit numbers of your commits won't match, so you need to do:
git push origin master --force
Marek
On 29/02/16 17:22, Bill Burke wrote:
can you do that after you've committed your local repo without
screwing anything?
On 2/29/2016 10:23 AM, Stian Thorgersen wrote:
> I just do:
>
> git fetch upstream
> git rebase upstream/master
>
> And that's it
>
> On 29 February 2016 at 15:54, Bill Burke <bburke(a)redhat.com
> <mailto:bburke@redhat.com>> wrote:
>
> How you guys do this? I did a rebase -i and squashed everything
> but the
> PR contained diffs of merged files and not just my changes.
>
> --
> Bill Burke
> JBoss, a division of Red Hat
> http://bill.burkecentral.com
>
> _______________________________________________
> keycloak-dev mailing list
> keycloak-dev(a)lists.jboss.org <mailto:keycloak-dev@lists.jboss.org>
> https://lists.jboss.org/mailman/listinfo/keycloak-dev
>
>
--
Bill Burke
JBoss, a division of Red Hat
http://bill.burkecentral.com
_______________________________________________
keycloak-dev mailing list
keycloak-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/keycloak-dev
11:12 a.m.
On 29.02.2016 17:39, Marek Posolda wrote:
git push origin master --force
Just be extra careful on this command, as it is potentially destructive
when applied to the "main" repository. As a general rule, I use
"--force" only on my branches, and never on master (even less on the
"real" origin/upstream).
By the way: this is a good time to check if the main repository is
protected against force-pushes: http://snag.gy/2KjLY.jpg
- Juca.
11:14 a.m.
+1 do PRs from a branch and never force push master (even your own).
Scott Rossillo
Smartling | Senior Software Engineer
srossillo(a)smartling.com
On Feb 29, 2016, at 12:12 PM, Juraci Paixão Kröhling
<juraci(a)kroehling.de> wrote:
On 29.02.2016 17:39, Marek Posolda wrote:
> git push origin master --force
Just be extra careful on this command, as it is potentially destructive
when applied to the "main" repository. As a general rule, I use
"--force" only on my branches, and never on master (even less on the
"real" origin/upstream).
By the way: this is a good time to check if the main repository is
protected against force-pushes: http://snag.gy/2KjLY.jpg
- Juca.
_______________________________________________
keycloak-dev mailing list
keycloak-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/keycloak-dev
2:24 p.m.
Yeah, you need to be careful when using this. Similarly like you need to
be careful when using command "rm -rf" on linux. Both are dangerous
stuff, on the other hand both can save you time if you are careful and
you know what you're doing ;-)
Marek
On 29/02/16 18:14, Scott Rossillo wrote:
+1 do PRs from a branch and never force push master (even your own).
Scott Rossillo
Smartling | Senior Software Engineer
srossillo(a)smartling.com <mailto:srossillo@smartling.com>
> On Feb 29, 2016, at 12:12 PM, Juraci Paixão Kröhling
> <juraci(a)kroehling.de <mailto:juraci@kroehling.de>> wrote:
>
> On 29.02.2016 17:39, Marek Posolda wrote:
>> git push origin master --force
>
> Just be extra careful on this command, as it is potentially destructive
> when applied to the "main" repository. As a general rule, I use
> "--force" only on my branches, and never on master (even less on the
> "real" origin/upstream).
>
> By the way: this is a good time to check if the main repository is
> protected against force-pushes: http://snag.gy/2KjLY.jpg
>
> - Juca.
>
> _______________________________________________
> keycloak-dev mailing list
> keycloak-dev(a)lists.jboss.org <mailto:keycloak-dev@lists.jboss.org>
> https://lists.jboss.org/mailman/listinfo/keycloak-dev
_______________________________________________
keycloak-dev mailing list
keycloak-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/keycloak-dev
6:21 p.m.
On 02/29/2016 12:12 PM, Juraci Paixão Kröhling wrote:
On 29.02.2016 17:39, Marek Posolda wrote:
> git push origin master --force
Just be extra careful on this command, as it is potentially destructive
when applied to the "main" repository. As a general rule, I use
"--force" only on my branches, and never on master (even less on the
"real" origin/upstream).
NOte that you can always get back to a previsous committed state in
git. Run
git reflog and you will see commits all the way back.
A rebase will often fail on a merge, and you can either fix it and roll
forward with
git rebase --continue
or abort it and be back in your previous state with
git rebase --abort
By the way: this is a good time to check if the main repository is
protected against force-pushes: http://snag.gy/2KjLY.jpg
- Juca.
_______________________________________________
keycloak-dev mailing list
keycloak-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/keycloak-dev
12:05 p.m.
On 2/29/2016 9:54 AM, Bill Burke wrote:
How you guys do this? I did a rebase -i and squashed everything but
the
PR contained diffs of merged files and not just my changes.
I've always followed the WildFly team procedures from here:
https://developer.jboss.org/wiki/HackingOnWildFly
6:22 p.m.
On 02/29/2016 01:05 PM, Stan Silvert wrote:
On 2/29/2016 9:54 AM, Bill Burke wrote:
> How you guys do this? I did a rebase -i and squashed everything but the
> PR contained diffs of merged files and not just my changes.
>
I've always followed the WildFly team procedures from here:
https://developer.jboss.org/wiki/HackingOnWildFly
_______________________________________________
keycloak-dev mailing list
keycloak-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/keycloak-dev
BTW, this is one reason why I
really like Gerrit and the automated CI
runs hapening before any commit, with commits to master only being done
in an automated fashion. Openstack has its issues, but the dev process
has been made to scale.
12:04 a.m.
We do that as well. Commits to main repository is only done through GitHub
PRs and all PRs run through automated CI by Travis prior to being merged.
On 6 March 2016 at 01:22, Adam Young <ayoung(a)redhat.com> wrote:
On 02/29/2016 01:05 PM, Stan Silvert wrote:
> On 2/29/2016 9:54 AM, Bill Burke wrote:
>> How you guys do this? I did a rebase -i and squashed everything but the
>> PR contained diffs of merged files and not just my changes.
>>
> I've always followed the WildFly team procedures from here:
> https://developer.jboss.org/wiki/HackingOnWildFly
>
> _______________________________________________
> keycloak-dev mailing list
> keycloak-dev(a)lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/keycloak-dev
BTW, this is one reason why I really like Gerrit and the automated CI
runs hapening before any commit, with commits to master only being done
in an automated fashion. Openstack has its issues, but the dev process
has been made to scale.
_______________________________________________
keycloak-dev mailing list
keycloak-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/keycloak-dev
3216
days inactive
3223
days old
11 comments
7 participants
participants (7)
-
Adam Young -
Bill Burke -
Juraci Paixão Kröhling -
Marek Posolda -
Scott Rossillo -
Stan Silvert -
Stian Thorgersen