latest 20 messages by multifractal

+ [2017-01-06T11:17:25Z] multifractal No idea what that is really but I'll read the book.
+ [2017-01-06T11:17:02Z] multifractal canton7: In case you're interested I found that `git reset --hard HEAD~2` fixed my problem.
+ [2017-01-06T11:06:48Z] multifractal That's fair enouygh, thanks anyway.
+ [2017-01-06T11:05:46Z] multifractal And status says "Your branch is ahead of 'origin/develop' by 2 commits"
+ [2017-01-06T11:05:12Z] multifractal Please commit or stash them."
+ [2017-01-06T11:05:12Z] multifractal ok thanks. when I type 'git rebase -i' it says "Cannot rebase: You have unstaged changes.
+ [2017-01-06T11:03:00Z] multifractal So I need to 'remove' the last 2 commits, as it were.
+ [2017-01-06T11:02:35Z] multifractal I'm not 100% sure what commit precisely means.
+ [2017-01-06T11:02:02Z] multifractal canton7: yes I did later create a commit after having removed the large files.
+ [2017-01-06T10:55:00Z] multifractal canton7: Thanks for the advice. Are you able to explain what the problem is a little more - I am a new git user and this is all rather confusing.
+ [2017-01-06T10:37:09Z] multifractal I fucked up my repo by accidentally trying to push 2 big files. I since deleted them, but now every time I try to push to the repo it still 'sees' those files and tries to push them too.
+ [2017-01-05T17:48:18Z] multifractal Now I can't push anything to my repo because it keeps trying to push those large files, even though they're no longer present.
+ [2017-01-05T17:47:56Z] multifractal So I git rm the big files and tried to push again, still failed.
+ [2017-01-05T17:47:42Z] multifractal I accidentally tried to push large files to my repo (I thought I had gitignored them, but I guess I had not done it properly). It failed the push becuse of oversized files...
+ [2016-12-16T11:43:33Z] multifractal That is to say -- it's not good practice to make branches for different features of the project. Rather branches should reflect different levels of the development cycle - stable, dev, release, etc.?
+ [2016-12-16T11:41:02Z] multifractal Wait no that's not correct -- I could just have a main (stable) branch for BIG_PROJ and then a development branch where I work on each thing_i as and when I need to. When I'm confident that they work, I can merge it back to the stable BIG_PROJ branch. Correct?
+ [2016-12-16T11:38:20Z] multifractal As far as I can tell, if there was a repo BIG_PROJ with branches for thing1, thing2, thing3... each of the thingi's would need sub-branches of their own, to maintain version control. Is this correct