Skip to content
This repository has been archived by the owner on May 12, 2018. It is now read-only.

Fix typo in rebar_erlydtl_compiler #208

Merged
merged 1 commit into from
Mar 6, 2014
Merged

Fix typo in rebar_erlydtl_compiler #208

merged 1 commit into from
Mar 6, 2014

Conversation

goofansu
Copy link
Contributor

No description provided.

@goofansu
Copy link
Contributor Author

Sorry for the close of #207.

I'm not familiar with how to change git comments.

@ghost
Copy link

ghost commented Jan 11, 2014

I'm not familiar with how to change git comments.

$ git commit --amend

@ghost
Copy link

ghost commented Jan 11, 2014

+1

cc @jaredmorrow

@goofansu
Copy link
Contributor Author

@Tuncer Got it. Thank you.

@jaredmorrow
Copy link
Contributor

@goofansu, can you rebase this so I can merge it, thanks.

@goofansu
Copy link
Contributor Author

goofansu commented Mar 6, 2014

@jaredmorrow Sorry for the poor operation, will you tell me how to do the rebase correctly?

@nuex
Copy link

nuex commented Mar 6, 2014

@goofansu: check out your local master branch and git pull to make sure you have the latest changes. Then check out your feature branch and do "git rebase -i master". Fix any conflicts that arise (if any) then use "git add" to add the fixed files to the staging area. Once you've fixed all the conflicts and added them to the staging area type "git rebase --continue". Repeat until the rebase is complete. Once you're done do "git push featurebranch -f" to force a remote update with your rebased commit history.

@goofansu
Copy link
Contributor Author

goofansu commented Mar 6, 2014

It's ok now.

@nuex Thank you.

@nuex
Copy link

nuex commented Mar 6, 2014

@goofansu You're welcome!

jaredmorrow added a commit that referenced this pull request Mar 6, 2014
@jaredmorrow jaredmorrow merged commit fa1a2b5 into rebar:master Mar 6, 2014
@goofansu goofansu deleted the fix-typo-rebar-erlydtl-compiler branch March 6, 2014 05:34
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants