Add page to configure draft sources #2962
Draft
Conversation
This file contains 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
Nateowami
added
the
will require testing
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
...ipture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts
Fixed
Show fixed
Hide fixed
marksvc
force-pushed
the
feature/configure-sources
branch
from
615d115 to
0bf8bbd
Compare
...ipture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts
Fixed
Show fixed
Hide fixed
...ipture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts
Fixed
Show fixed
Hide fixed
|
@marksvc Could you resolve merge conflicts, since they're on changes you made? |
marksvc
force-pushed
the
feature/configure-sources
branch
from
d185c4b to
db36b13
Compare
|
@Nateowami You might already have a great conflict resolution tool. If not, FYI that kdiff3 automatically solves a number of conflicts that git doesn't already automatically solve. kdiff3's interface is a learning curve, but it's worth it once you get comfortable with the tool. I still had to think about what was going on in the remaining conflicts (and it makes sense that you asked me to resolve it since I worked on it), but it is a nice way to address conflicts. And a good time to mention the useful tool :)
|
...e/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.spec.ts
Fixed
Show fixed
Hide fixed
...ipture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts
Fixed
Show fixed
Hide fixed
Nateowami
force-pushed
the
feature/configure-sources
branch
from
db36b13 to
9e4e28a
Compare
src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources.stories.ts
Fixed
Show fixed
Hide fixed
Nateowami
force-pushed
the
feature/configure-sources
branch
from
57f317a to
7bc01ef
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change is