Skip to content

SHA-1 of the bottom HEAD is replaced by 68aef35 - #231

Closed
MaxGekk wants to merge 1 commit into
progit:masterfrom
MaxGekk:master
Closed

SHA-1 of the bottom HEAD is replaced by 68aef35#231
MaxGekk wants to merge 1 commit into
progit:masterfrom
MaxGekk:master

Conversation

@MaxGekk

@MaxGekk MaxGekk commented Jan 11, 2015

Copy link
Copy Markdown

Old SHA-1 (eb43bf8) of HEAD should be replaced by new value (68aef35) as the result of 'git commit'.

@ben

ben commented Jul 26, 2017

Copy link
Copy Markdown
Member

Sorry for the delay. This looks good, but now there's a conflict. Can you re-apply your change?

@aollier

aollier commented Jul 29, 2017

Copy link
Copy Markdown
Contributor

If you are stuck, this may help you: https://help.github.com/articles/addressing-merge-conflicts/.
You'll be more specifically concerned by this subject since the merge is complex: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/.

@aizulaiz

aizulaiz commented Feb 14, 2018

Copy link
Copy Markdown

Update

@aollier

aollier commented Mar 6, 2018

Copy link
Copy Markdown
Contributor

@ben this change is good but very old now. Could you do it by yourself from the most recent commit and close this pull request ?

@aollier

aollier commented Mar 9, 2018 •
edited
Loading

Copy link
Copy Markdown
Contributor

@ben Do you have Sketch 3 to modify the image ? Are you able to do it or not ?
I can't do for my part, because I don't have a Mac and so I don't have Sketch 3.

@lazarljubenovic

lazarljubenovic commented Mar 9, 2018

Copy link
Copy Markdown
Contributor

We should really replace these Sketch images with plain old SVGs, to be in spirit of the open source book.

@dunxen dunxen mentioned this pull request May 20, 2018
Merged
@progit progit deleted a comment from ninastar78 Aug 6, 2018
@progit progit deleted a comment from ninastar78 Aug 6, 2018
@ben ben closed this in #1056 Aug 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

See More

Successfully merging this pull request may close these issues.

5 participants

@MaxGekk @ben @aollier @aizulaiz @lazarljubenovic