FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Write the index to a repository directly in merge-cleanly.js examples by rcjsuen · Pull Request #1205 · nodegit/nodegit · GitHub

  1. nodegit
  2. nodegit

Repository navigation

Write the index to a repository directly in merge-cleanly.js examples #1205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxkorp merged 1 commit into from
Jan 30, 2017
Conversation 1 Commits 1 Checks 0 Files changed
Merged

Write the index to a repository directly in merge-cleanly.js examples #1205

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .js  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
5 changes: 1 addition & 4 deletions examples/merge-cleanly.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,7 @@ fse.remove(path.resolve(__dirname, repoDir))
// the repository instead of just writing it.
.then(function(index) {
if (!index.hasConflicts()) {
return index.write()
.then(function() {
return index.writeTreeTo(repository);
});
return index.writeTreeTo(repository);
}
})

Expand Down
Back | FazBrowse Home | New Git URL