小编yao*_*yao的帖子

$ git reset -- <file_path> 可以通过路径重置.

但是,$ git reset (--hard|--soft) <file_path>会报告如下错误:

Cannot do hard|soft reset with paths.

下面是textview布局,我希望在代码中将layout_marginRight修改为零.

<TextView
                android:id="@+id/status1"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="right"
                android:layout_marginRight="@dimen/keyguard_lockscreen_status_line_font_right_margin"
                android:singleLine="true"
                android:ellipsize="marquee"
                android:textAppearance="?android:attr/textAppearanceMedium"
                android:textSize="@dimen/keyguard_lockscreen_status_line_font_size"
                android:drawablePadding="4dip"
 />

当我将aqif代码复制到我的代码中时,手机会在开机动画时暂停.

private void updateStatus1() {
        if (mStatus1View != null) {
            MutableInt icon = new MutableInt(0);
            CharSequence string = getPriorityTextMessage(icon);
            mStatus1View.setText(string);
            LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) mStatus1View.getLayoutParams();
            params.rightMargin = 0;
            mStatus1View.setLayoutParams(params);

            mStatus1View.setCompoundDrawablesWithIntrinsicBounds(icon.value, 0, 0, 0);
            mStatus1View.setVisibility(mShowingStatus ? View.VISIBLE : View.INVISIBLE);
        }
    }

我是新手.当我希望重置难以丢弃所有本地修改时,git返回合并冲突

HEAD现在在3291a25将创建合并冲突1

我的操作:

1. 大约半个月我承诺如下

   git commit -am "will create merge conflict 1"
   

   Run Code Online (Sandbox Code Playgroud)

2. 今天我希望重置 - 坚持这个参考

   yaoyangyong@ubuntulucky:~/repos01$ git reset --hard HEAD
   HEAD is now at 3291a25 will create merge confict 1
   

   Run Code Online (Sandbox Code Playgroud)

3. 输出让我感到困惑.事实上,这只是我的旧评论.