Angband.oook.cz
Angband.oook.cz
AboutVariantsLadderForumCompetitionComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Development

 
 
Thread Tools Display Modes
Prev Previous Post   Next Post Next
Old January 26, 2020, 06:34   #11
eastwind
Apprentice
 
Join Date: Dec 2019
Location: Mexico, undisclosed location
Posts: 79
eastwind is on a distinguished road
Thanks, that shows what I'm looking at that is causing my question.

I don't get why the first line (5d2e4f5) is showing up. That change was pushed to my branch then pulled to master by Nick, so why should it still be showing as a difference that's in my branch but not master?

So another way to ask my same question is, after you push a change to your private fork and then get it merged into master, what do you have to do to your private fork to clean or reset or sync it with master so it's ready for the next change?
eastwind is offline   Reply With Quote
 


Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)
 
Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump

Similar Threads
Thread Thread Starter Forum Replies Last Post
silly angband question #4 Sky Vanilla 15 December 5, 2016 14:24
silly angband question #3 Sky Vanilla 12 November 14, 2016 00:41
Blessing silly question Skrym Vanilla 1 November 26, 2012 12:31
Probably a silly question Mr Mushroom Vanilla 4 May 31, 2011 05:55
Silly question, but... steeg1234321 Vanilla 13 March 28, 2008 18:17


All times are GMT +1. The time now is 23:43.


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2020, vBulletin Solutions Inc.