latest 19 messages by criticalcat
+
[2015-12-03T22:37:21Z]
criticalcat
(And the world didn't end so far)
+
[2015-12-03T22:36:18Z]
criticalcat
I made the changes, now I am treating master as a read-only copy of upstream/master
+
[2015-12-03T22:35:55Z]
criticalcat
Zarthus: thanks for your help
+
[2015-12-03T22:20:04Z]
criticalcat
ok cool
+
[2015-12-03T22:19:58Z]
criticalcat
It appears that upstream master no longer depends on the state of my branches?
+
[2015-12-03T22:19:31Z]
criticalcat
The pull request has already been completed - I guess my question is, by rewriting my master branch which has that commit in it, I shouldn't adversely affect upstream's master, correct?
+
[2015-12-03T22:18:52Z]
criticalcat
Zarthus: yes that's where I'm headed.
+
[2015-12-03T22:18:29Z]
criticalcat
: )
+
[2015-12-03T22:18:26Z]
criticalcat
The internet is full of Chiyos
+
[2015-12-03T22:18:01Z]
criticalcat
The internet is full of VxJasonxVs
+
[2015-12-03T22:17:47Z]
criticalcat
So I don't think anything terrible will happen, but I think what you described is what I"m going to do...
+
[2015-12-03T22:16:17Z]
criticalcat
I want to basically create myfork/masterold to house the commit that was merged, then get myfork/master back to point A, so I can track project/master on myfork/master again.
+
[2015-12-03T22:15:18Z]
criticalcat
Zarthus: so my goal is to get into a situation where I can have myfork/master be a read-only copy of project/master again. It was a mistake on my part to commit to myfork/master and request a merge from that branch in the first place. There was say, project/master at point A, I forked myfork/master from A, project/master commits to get to point D, my change is E, project/master merged E from myfork/master. Pull request is done already.
+
[2015-12-03T22:10:40Z]
criticalcat
Zarthus: due to ruining something and making the people mad? Or due to something else.
+
[2015-12-03T21:59:25Z]
criticalcat
suppose a pull request has been successfully completed from myfork/master to project/master, if I rewrite the history of myfork/master, that won't mess up project/master in any way will it?
+
[2015-11-21T20:41:47Z]
criticalcat
: D
+
[2015-11-21T20:41:43Z]
criticalcat
guess I will find out when I force push
+
[2015-11-21T20:33:03Z]
criticalcat
my/masterundo from the crappy master and creating a branch my/smallchange branch, and doing "git branch -f master HEAD~24" to put my/master back the way it was before I started mucking around. Question: what will happen to the (closed) PR that was suggesting a merge from my/master to upstream/master when my/master's about to be overwritten?
+
[2015-11-21T20:33:03Z]
criticalcat
Suppose I forked an upstream repo, committed a couple of changes to my/master, created a pull request to integrate my/master to upstream/master, further changes were made on upstream/master, I merged upstream/master into my/master (not realizing that this merge would show up on the PR, that I should have branched to make the change), closed the PR, and want to clean up my/master. Locally it looks better after creating a branch