latest 13 messages by Joric
+
[2017-06-12T23:45:11Z]
Joric
thanks
+
[2017-06-12T23:35:16Z]
Joric
can't google it out, is it possible to change Project Page subdirectory? i mean using custom address https://user.github.io/yyy for project xxx without renaming the project to yyy?
+
[2015-04-02T12:23:56Z]
Joric
tons of commits that have no relation to the feature branch whatsoever
+
[2015-04-02T12:23:08Z]
Joric
i'd personally prefer --squash in all cases, now it just looks pretty nasty both in git log and github
+
[2015-04-02T12:22:05Z]
Joric
like, i merge 50 commits from master to a feature branch in a single commit (with --squash) then after a while I merge another 40 commits from master and get worse (larger) conflicts because of --squash
+
[2015-04-02T12:19:35Z]
Joric
s/rebases/merges
+
[2015-04-02T12:14:24Z]
Joric
i'm just wondering if rebase --squash from master somehow makes future rebases harder, there will be larger conflicts or something
+
[2015-04-02T12:11:27Z]
Joric
well yep, it's pretty much shared
+
[2015-04-02T12:10:12Z]
Joric
can't use rebase, sorry, it's already pushed to the server
+
[2015-04-02T12:06:50Z]
Joric
it's pretty common for large pull requests i guess
+
[2015-04-02T12:05:44Z]
Joric
feature branch is public, yep
+
[2015-04-02T12:04:53Z]
Joric
well i just didn't use squash and got 50 commits from other ppl in my feature branch
+
[2015-04-02T12:02:15Z]
Joric
how to keep feature branches up to date, should I use "git merge master" or "git merge --squash master" ? are there any downsides for the latter?