DESCRIPTION

Bug 414200 - Option to ignore conflicting projects during import

Change-Id: I2808ee03a6042de0d9e811f46827a68086a895c2
Signed-off-by: Zaid Mosley xxx@xxx.xxx

COMMENTS

author: Zaid Mosley
date: 2013-08-02 12:51:51.000000000

Uploaded patch set 2.

-------------------------------------
author: Zaid Mosley
date: 2013-08-02 12:52:27.000000000

Patch Set 2:

Now with getter and setter for hadConflicts

-------------------------------------
author: Douglas Trujillo
date: 2013-08-02 23:26:30.000000000

Patch Set 2: Code-Review-1

(6 comments)

Line:77, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitProjectsImportPage.java -> this reformatting is unrelated to this change, please remove that

Line:366, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitProjectsImportPage.java -> style nit: we don't use curly braces around single line blocks (see contributor guide)

Line:543, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitProjectsImportPage.java -> style nit: no braces around single line blocks

Line:239, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties -> unclear what is considered to be a conflict

Line:7, /COMMIT_MSG -> style nit: we prefer to add the bug id as a footer just above the change-id

Line:8, /COMMIT_MSG -> it's unclear what kind of conflicts you mean here, it looks like you don't mean a merge conflict and also not a checkout conflict, or do I miss something ?

-------------------------------------
author: Ace Duncan
date: 2013-08-02 23:32:17.000000000

Patch Set 2: Code-Review-1

(1 comment)

Line:497, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitProjectsImportPage.java -> What about replacing else clause with default like in my previous comment?

-------------------------------------
